tests/test-config: Fix regex causing Debian test failure
authorRobert Fairley <rfairley@redhat.com>
Wed, 17 Apr 2019 16:03:55 +0000 (12:03 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 23 Apr 2019 06:11:39 +0000 (06:11 +0000)
Fix CI failure due to mismatching quotes in the error output given
between Fedora and Debian test suites.

Example of the error in Debian Stretch:
https://api.travis-ci.org/v3/job/519335717/log.txt

Closes: #1839
Approved by: cgwalters

tests/test-config.sh

index 483cff41cc9fe080ed92ad22cf5597e576ce734c..7e913d321c4acc10c1ef7f3a5bc50da5ca167bbc 100755 (executable)
@@ -76,7 +76,9 @@ assert_not_file_has_content repo/config "lock-timeout-secs="
 if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; then
     assert_not_reached "ostree config get should not work after unsetting a key"
 fi
-assert_file_has_content err.txt "error: Key file does not have key “lock-timeout-secs” in group “core”"
+# Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
+# test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
+assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core."
 
 # Check that it's idempotent
 ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs